<!DOCTYPE html>
<html>
<head data-suburl="">
	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
	<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
	
		<meta name="author" content="diogo" />
		<meta name="description" content="gnu-social - GNU social is a social communication software used in federated social networks. It is widely supported and has a large userbase. It is already used by the Free Software Foundation." />
		<meta name="keywords" content="go, git, self-hosted, gogs">
	
	<meta name="referrer" content="no-referrer" />
	<meta name="_csrf" content="BJPqbyCbR6EyvKzGL1krhE4QV3U6MTYwNDc5MjMxNTc0MTEzMDUwMA==" />
	<meta name="_suburl" content="" />
	
	
	
		<meta property="og:url" content="https://notabug.org/diogo/gnu-social" />
		<meta property="og:type" content="object" />
		<meta property="og:title" content="diogo/gnu-social">
		<meta property="og:description" content="GNU social is a social communication software used in federated social networks. It is widely supported and has a large userbase. It is already used by the Free Software Foundation.">
		<meta property="og:image" content="https://notabug.org/avatars/12290" />
	

	<link rel="shortcut icon" href="/img/favicon.png" />

	<script src="/js/jquery-1.11.3.min.js"></script>
	<script src="/js/libs/jquery.are-you-sure.js"></script>
        <link href="/img/icon-48.ico" rel="icon" type="image/x-icon" />
        <link href="/img/icon-60.png" rel="apple-touch-icon">
        <link href="/img/icon-76.png" rel="apple-touch-icon" sizes="76x76">
        <link href="/img/icon-120.png" rel="apple-touch-icon" sizes="120x120">
        <link href="/img/icon-152.png" rel="apple-touch-icon" sizes="152x152">
        <link href="/img/icon-240.png" rel="apple-touch-icon" sizes="240x240">

	<link rel="stylesheet" href="/assets/font-awesome-4.6.3/css/font-awesome.min.css">
	<link rel="stylesheet" href="/assets/octicons-4.3.0/octicons.min.css">

	
	

	

	
	<link rel="stylesheet" href="/css/semantic-2.2.13.min.css">
	<link rel="stylesheet" href="/css/gogs.css?v=6fc9e85aa88133794d3434ea74aa557a">
	<link rel="stylesheet" href="/css/notabug.css">

	
	<script src="/js/semantic-2.2.13.min.js"></script>
	<script src="/js/gogs.js?v=6fc9e85aa88133794d3434ea74aa557a"></script>

	<title>[WIP] Add namespaces and, in particular, fix Conflict with Event class and PHP Event module - NotABug.org: Free code hosting</title>

	<meta name="theme-color" content="#428bca">

	


<noscript><style>.nojs-popup:hover > .menu { display: block ; }</style></noscript>


</head>
<body>
	<div class="full height">
		<noscript>Please enable JavaScript in your browser!</noscript>

		
			<div id="header-div" class="following bar light">
				<div class="ui container">
					<div class="ui grid">
						<div class="column">
							<div class="ui top secondary menu">
								<a class="item brand" href="/">
									<img class="ui mini image" src="/img/favicon.png">
								</a>

								
									<a class="item" href="/">Home</a>
								

								<a class="item" href="/explore/repos">Explore</a>
								

								



									<a class="notabug-item item" href="/help" rel="noreferrer">Help</a>




									<div class="right menu">
										
											<a class="item" href="/user/sign_up">
												<i class="octicon octicon-person"></i> Register
											</a>
										
										<a class="item" href="/user/login?redirect_to=%2fdiogo%2fgnu-social%2fpulls%2f110">
											<i class="octicon octicon-sign-in"></i> Sign In
										</a>
									</div>

								
							</div>
						</div>
					</div>
				</div>
			</div>
		


<div class="repository view issue pull">
	<div class="header-wrapper">

	<div class="ui container">
		<div class="ui vertically padded grid head">
			<div class="column">
				<div class="ui header">
					<div class="ui huge breadcrumb">
						<i class="mega-octicon octicon-repo"></i>
						<a href="/diogo">diogo</a>
						<div class="divider"> / </div>
						<a href="/diogo/gnu-social">gnu-social</a>
						
						
					</div>

					
						<div class="ui right">
							<div class="ui labeled button" tabindex="0">
								<a class="ui basic button" href="/diogo/gnu-social/action/watch?redirect_to=%2fdiogo%2fgnu-social%2fpulls%2f110">
									<i class="icon fa-eye-slash"></i>Watch
								</a>
								<a class="ui basic label" href="/diogo/gnu-social/watchers">
									9
								</a>
							</div>
							<div class="ui labeled button" tabindex="0">
								<a class="ui basic button" href="/diogo/gnu-social/action/star?redirect_to=%2fdiogo%2fgnu-social%2fpulls%2f110">
									<i class="icon fa-star-o"></i>Star
								</a>
								<a class="ui basic label" href="/diogo/gnu-social/stars">
									22
								</a>
							</div>
							
								<div class="ui labeled button" tabindex="0">
									<a class="ui basic button " href="/repo/fork/25974">
										<i class="octicon octicon-repo-forked"></i>Fork
									</a>
									<a class="ui basic label" href="/diogo/gnu-social/forks">
										21
									</a>
								</div>
							
						</div>
					
				</div>
			</div>
		</div>
	</div>


	<div class="ui tabs container">
		<div class="ui tabular menu navbar">
			
				<a class=" item" href="/diogo/gnu-social">
					<i class="octicon octicon-file-text"></i> Files
				</a>
			
			
				<a class=" item" href="/diogo/gnu-social/issues">
					<i class="octicon octicon-issue-opened"></i> Issues <span class="ui blue small label">73</span>
				</a>
			
			
				<a class="active item" href="/diogo/gnu-social/pulls">
					<i class="octicon octicon-git-pull-request"></i> Pull Requests <span class="ui blue small label">3</span>
				</a>
			
			
				<a class=" item" href="/diogo/gnu-social/wiki">
					<i class="octicon octicon-book"></i> Wiki
				</a>
			
			
		</div>
	</div>
	<div class="ui tabs divider"></div>

</div>

	<div class="ui container">
		<div class="navbar">
			<div class="ui compact small menu">
	<a class=" item" href="/diogo/gnu-social/labels">Labels</a>
	<a class=" item" href="/diogo/gnu-social/milestones">Milestones</a>
</div>

			<div class="ui right">
				
					<a class="ui green button disabled" href="/diogo/gnu-social/compare/nightly...">New Pull Request</a>
				
			</div>
		</div>
		<div class="ui divider"></div>
		
			<div class="sixteen wide column title">
	<div class="ui grid">
		<h1 class="twelve wide column">
			<span class="index">#110</span> <span id="issue-title" class="has-emoji">[WIP] Add namespaces and, in particular, fix Conflict with Event class and PHP Event module</span>
			<div id="edit-title-input" class="ui input" style="display: none">
				<input value="[WIP] Add namespaces and, in particular, fix Conflict with Event class and PHP Event module">
			</div>
		</h1>
		
	</div>
	
		<div class="ui green large label"><i class="octicon octicon-issue-opened"></i> Open</div>
	

	
		
			<a href="/senooken">senooken</a>
			<span class="pull-desc">wants to merge 2 commits from <code>senooken/fix-event-class-conflict</code> into <code>diogo/nightly</code></span>
		
	
	<div class="ui divider"></div>
</div>

			<div class="ui top attached pull tabular menu">
	<a class="item active" href="/diogo/gnu-social/pulls/110">
		<span class="octicon octicon-comment-discussion"></span>
		Conversation
		<span class="ui blue small label">5</span>
	</a>
	<a class="item " href="/diogo/gnu-social/pulls/110/commits">
		<span class="octicon octicon-git-commit"></span>
		Commits
		<span class="ui blue small label">2</span>
	</a>
	<a class="item " href="/diogo/gnu-social/pulls/110/files">
		<span class="octicon octicon-diff"></span>
		Files changed
		<span class="ui blue small label">202</span>
	</a>
</div>

			<div class="ui bottom attached tab pull segment active" data-tab="request-">
				<div class="ui grid">
	
	

	
	<div class="twelve wide column comment-list">
		<ui class="ui comments">
			<div class="comment">
				<a class="avatar" href="/senooken">
					<img src="https://seccdn.libravatar.org/avatar/5349e716212163fd511dfe106ff42e0a">
				</a>
				<div class="content">
					<div class="ui top attached header">
						<span class="text grey"><a href="/senooken">SENOO, Ken</a> commented <a href="#issue-64475"><span class="time-since" title="Fri, 14 Feb 2020 16:45:26 UTC">8 months ago</span></a></span>
						<div class="ui right actions">
							
						</div>
					</div>
					<div class="ui attached segment">
						<div class="render-content markdown has-emoji">
							
								<p>I am using GNU social on rental server.</p>

<p>My server has PHP with Event module enabled (<code>extension = event</code> in <code>php.ini</code> or built-in).</p>

<p>But GNU social also has Event class (<code>lib/util.event.php</code>) with no namespace!</p>

<p>So when I install GNU social and access <code>install.php</code>, following error message is shown.</p>

<pre><code>Fatal error: Cannot declare class Event, because the name is already in use in /home/senooken/.local/var/www/html/gnusocial/lib/util/event.php on line 32      
</code></pre>

<p>Surely I could fix my <code>php.ini</code>, but my rental server could be disabled Event module due to PHP built-in module.</p>

<p>So I wanted to fix this conflict and I fixed for my rental server.</p>

<p>I fixed this conflict by following steps.</p>

<ol>
<li>Add <code>namespace GNUsocial;</code> to <code>lib/util/event.php</code>.</li>
<li>Fixing target file are using Event class and no <code>use</code> declaration (ex. <code>use Hoa\Event;</code>).</li>
<li>Replace <code>Event::</code> to <code>\GNUsocial\Event::</code> in target files.</li>
</ol>

<p>I fixed by following shell script.</p>

<pre><code>find . -name &#34;*.php&#34; | while read -r file; do
  [ &#34;$file&#34; = &#34;./lib/util/event.php&#34; ] &amp;&amp; continue
  if grep -q &#39;Event::&#39; &#34;$file&#34; &amp;&amp; ! grep -q &#39;use.*Event.*&#39; &#34;$file&#34;; then
    sed -i &#39;s/Event::/\\GNUsocial\\Event::/g&#39; &#34;$file&#34;
  fi
done

sed -i &#39;/defined/inamespace GNUsocial;\n&#39; lib/util/event.php
</code></pre>

<p>Could you check my pull request?</p>

							
						</div>
						<div class="raw-content hide">I am using GNU social on rental server.

My server has PHP with Event module enabled (`extension = event` in `php.ini` or built-in).

But GNU social also has Event class (`lib/util.event.php`) with no namespace!

So when I install GNU social and access `install.php`, following error message is shown.

```
Fatal error: Cannot declare class Event, because the name is already in use in /home/senooken/.local/var/www/html/gnusocial/lib/util/event.php on line 32      
```

Surely I could fix my `php.ini`, but my rental server could be disabled Event module due to PHP built-in module.

So I wanted to fix this conflict and I fixed for my rental server.

I fixed this conflict by following steps.

1. Add `namespace GNUsocial;` to `lib/util/event.php`.
2. Fixing target file are using Event class and no `use` declaration (ex. `use Hoa\Event;`).
3. Replace `Event::` to `\GNUsocial\Event::` in target files.

I fixed by following shell script.

```
find . -name &#34;*.php&#34; | while read -r file; do
  [ &#34;$file&#34; = &#34;./lib/util/event.php&#34; ] &amp;&amp; continue
  if grep -q &#39;Event::&#39; &#34;$file&#34; &amp;&amp; ! grep -q &#39;use.*Event.*&#39; &#34;$file&#34;; then
    sed -i &#39;s/Event::/\\GNUsocial\\Event::/g&#39; &#34;$file&#34;
  fi
done

sed -i &#39;/defined/inamespace GNUsocial;\n&#39; lib/util/event.php
```

Could you check my pull request?</div>
						<div class="edit-content-zone hide" data-write="issue-64475-write" data-preview="issue-64475-preview" data-update-url="/diogo/gnu-social/issues/110/content" data-context="/diogo/gnu-social"></div>
					</div>
					
				</div>
			</div>

			
				

				
				
					<div class="comment" id="issuecomment-17688">
						<a class="avatar" href="/diogo">
							<img src="/avatars/12290">
						</a>
						<div class="content">
							<div class="ui top attached header">
								<span class="text grey"><a href="/diogo">Diogo Cordeiro</a> commented <a href="#issuecomment-17688"><span class="time-since" title="Fri, 14 Feb 2020 17:12:18 UTC">8 months ago</span></a></span>
								<div class="ui right actions">
									
										<div class="item tag">
											
												Owner
											
										</div>
									
									
								</div>
							</div>
							<div class="ui attached segment">
								<div class="render-content markdown has-emoji">
									
										<p>GNU social really should be using namespaces and such addition to our code is wanted, <strong>a MR adding namespaces to all of our code would be preferred</strong>, which is why I am against merging this for now...</p>

<p>Furthermore, there are some issues with the used shell script, <strong>everything under <code>vendor/</code> is third party code</strong>, therefore, changes like the one made to the file <code>vendor/hoa/event/Bucket.php:86</code> are wrong.</p>

<p>Finally, something to bear in mind is that, being this class directly related to our Event dispatcher, it is often used by third party plugins, therefore, this change will break some of them. On the other hand, v2.0 already breaks some backwards compatibility, there&#39;s more to gain from using namespaces. Furthermore, plugins usually are small enough to allow adding namespaces easily by means of <code>use</code> instead of full calls like <code>\GNUsocial\</code>.</p>

<p>Thank you for starting some work on adding namespaces to our codebase and looking forward to contributing :)</p>

									
								</div>
								<div class="raw-content hide">GNU social really should be using namespaces and such addition to our code is wanted, **a MR adding namespaces to all of our code would be preferred**, which is why I am against merging this for now...

Furthermore, there are some issues with the used shell script, **everything under `vendor/` is third party code**, therefore, changes like the one made to the file `vendor/hoa/event/Bucket.php:86` are wrong.

Finally, something to bear in mind is that, being this class directly related to our Event dispatcher, it is often used by third party plugins, therefore, this change will break some of them. On the other hand, v2.0 already breaks some backwards compatibility, there&#39;s more to gain from using namespaces. Furthermore, plugins usually are small enough to allow adding namespaces easily by means of `use` instead of full calls like `\GNUsocial\`.

Thank you for starting some work on adding namespaces to our codebase and looking forward to contributing :)</div>
								<div class="edit-content-zone hide" data-write="issuecomment-17688-write" data-preview="issuecomment-17688-preview" data-update-url="/diogo/gnu-social/comments/17688" data-context="/diogo/gnu-social"></div>
							</div>
							
						</div>
					</div>
				

			
				

				
				
					<div class="comment" id="issuecomment-17691">
						<a class="avatar" href="/senooken">
							<img src="https://seccdn.libravatar.org/avatar/5349e716212163fd511dfe106ff42e0a">
						</a>
						<div class="content">
							<div class="ui top attached header">
								<span class="text grey"><a href="/senooken">SENOO, Ken</a> commented <a href="#issuecomment-17691"><span class="time-since" title="Fri, 14 Feb 2020 17:38:12 UTC">8 months ago</span></a></span>
								<div class="ui right actions">
									
										<div class="item tag">
											
												Poster
											
										</div>
									
									
								</div>
							</div>
							<div class="ui attached segment">
								<div class="render-content markdown has-emoji">
									
										<p>Hi. Thanks for your quick comment. Me too, we should add namespace to all related files at first.</p>

<p>But this is too many change. So in my first step, I will try fixing my problem in this pull request.</p>

<p>I missed <code>vendor/hoa/event/Bucket.php:86</code> only in <code>vendor/</code>.</p>

<p>In my step 3. Replace Event:: to \GNUsocial\Event:: in target files, I  originally inserted <code>use GNUsocial\Event;</code> instead of full prefix.</p>

<p>But I thought full prefix is more smaller modifying line before sent pull request. But for third party plugins, <code>use GNUsocial\Event</code> is better same as your opinion.</p>

<p>If we will introduce namespace for whole code, are there policy?</p>

<p>If all tasks are introducing <code>namespace GNUsocial;</code> in related code, I will try it by creating shell script.</p>

									
								</div>
								<div class="raw-content hide">Hi. Thanks for your quick comment. Me too, we should add namespace to all related files at first.

But this is too many change. So in my first step, I will try fixing my problem in this pull request.

I missed `vendor/hoa/event/Bucket.php:86` only in `vendor/`.

In my step 3. Replace Event:: to \GNUsocial\Event:: in target files, I  originally inserted `use GNUsocial\Event;` instead of full prefix.

But I thought full prefix is more smaller modifying line before sent pull request. But for third party plugins, `use GNUsocial\Event` is better same as your opinion.

If we will introduce namespace for whole code, are there policy?

If all tasks are introducing `namespace GNUsocial;` in related code, I will try it by creating shell script.</div>
								<div class="edit-content-zone hide" data-write="issuecomment-17691-write" data-preview="issuecomment-17691-preview" data-update-url="/diogo/gnu-social/comments/17691" data-context="/diogo/gnu-social"></div>
							</div>
							
						</div>
					</div>
				

			
				

				
				
					<div class="comment" id="issuecomment-17708">
						<a class="avatar" href="/senooken">
							<img src="https://seccdn.libravatar.org/avatar/5349e716212163fd511dfe106ff42e0a">
						</a>
						<div class="content">
							<div class="ui top attached header">
								<span class="text grey"><a href="/senooken">SENOO, Ken</a> commented <a href="#issuecomment-17708"><span class="time-since" title="Fri, 14 Feb 2020 21:29:03 UTC">8 months ago</span></a></span>
								<div class="ui right actions">
									
										<div class="item tag">
											
												Poster
											
										</div>
									
									
								</div>
							</div>
							<div class="ui attached segment">
								<div class="render-content markdown has-emoji">
									
										<p>Firstly, I tried introducing namespace for whole code, but I realized that there are a lot of PHP standard functions. So I gave up in this time.</p>

<p>But I responded to the others comments.</p>

<ol>
<li>Remove <code>vendor/</code> for fixing target.</li>
<li>Change full prefix to <code>use GNUsocial\Event;</code>.</li>
</ol>

<p>I used following shell commands for these fix from nightly branch.</p>

<pre><code>find . -name &#34;*.php&#34; | while read -r file; do
    case &#34;$file&#34; in *vendor/*|*lib/util/event.php) continue; esac
    (! grep -q Event:: &#34;$file&#34; || grep -q &#39;use GNUsocial\\Event;&#39; &#34;$file&#34;) &amp;&amp; continue
    sed -i &#39;0,/^[a-zA-Z0-9$]/s/^[a-zA-Z0-9$].*$/use GNUsocial\\Event;\n\n&amp;/&#39; &#34;$file&#34;
done

grep -q &#39;namespace GNUSocial;&#39; lib/util/event.php ||
    sed -i &#39;0,/^[a-zA-Z0-9$]/s/^[a-zA-Z0-9$].*$/namespace GNUsocial;\n\n&amp;/&#39; lib/util/event.php
</code></pre>

<p>I inserted <code>namespace GNUsocial;</code> and <code>use GNUSocial\Event;</code> before 2 lines of first valid code in target file.</p>

<p>I wish I want to introduce whole namespace. But it is challenging work.So I will fix my small problem in first step.</p>

<p>I am watching this nightly branch and my GNU social server (<a href="https://social.senooken.jp/senooken" rel="nofollow">https://social.senooken.jp/senooken</a>) is latest nightly branch since 2 weeks ago (unstable and buggy).</p>

<p>I want to communicate with other ActivityPub server (Mastodon v3 and Misskey). After ActivityPub plugins working well, why don&#39;t we try to this namespace problem?</p>

<p>Please check my pull request.</p>

									
								</div>
								<div class="raw-content hide">Firstly, I tried introducing namespace for whole code, but I realized that there are a lot of PHP standard functions. So I gave up in this time.

But I responded to the others comments.

1. Remove `vendor/` for fixing target.
2. Change full prefix to `use GNUsocial\Event;`.

I used following shell commands for these fix from nightly branch.

```
find . -name &#34;*.php&#34; | while read -r file; do
	case &#34;$file&#34; in *vendor/*|*lib/util/event.php) continue; esac
	(! grep -q Event:: &#34;$file&#34; || grep -q &#39;use GNUsocial\\Event;&#39; &#34;$file&#34;) &amp;&amp; continue
	sed -i &#39;0,/^[a-zA-Z0-9$]/s/^[a-zA-Z0-9$].*$/use GNUsocial\\Event;\n\n&amp;/&#39; &#34;$file&#34;
done

grep -q &#39;namespace GNUSocial;&#39; lib/util/event.php ||
	sed -i &#39;0,/^[a-zA-Z0-9$]/s/^[a-zA-Z0-9$].*$/namespace GNUsocial;\n\n&amp;/&#39; lib/util/event.php
```

I inserted `namespace GNUsocial;` and `use GNUSocial\Event;` before 2 lines of first valid code in target file.

I wish I want to introduce whole namespace. But it is challenging work.So I will fix my small problem in first step.

I am watching this nightly branch and my GNU social server (https://social.senooken.jp/senooken) is latest nightly branch since 2 weeks ago (unstable and buggy).

I want to communicate with other ActivityPub server (Mastodon v3 and Misskey). After ActivityPub plugins working well, why don&#39;t we try to this namespace problem?

Please check my pull request.</div>
								<div class="edit-content-zone hide" data-write="issuecomment-17708-write" data-preview="issuecomment-17708-preview" data-update-url="/diogo/gnu-social/comments/17708" data-context="/diogo/gnu-social"></div>
							</div>
							
						</div>
					</div>
				

			
				

				
				
					<div class="comment" id="issuecomment-17709">
						<a class="avatar" href="/diogo">
							<img src="/avatars/12290">
						</a>
						<div class="content">
							<div class="ui top attached header">
								<span class="text grey"><a href="/diogo">Diogo Cordeiro</a> commented <a href="#issuecomment-17709"><span class="time-since" title="Fri, 14 Feb 2020 21:44:10 UTC">8 months ago</span></a></span>
								<div class="ui right actions">
									
										<div class="item tag">
											
												Owner
											
										</div>
									
									
								</div>
							</div>
							<div class="ui attached segment">
								<div class="render-content markdown has-emoji">
									
										<p>I agree that adding namespaces to the current codebase will be a lot of work.</p>

<p>Once proper ActivityPub support is achieved, i.e., we finish our current <a href="https://kanban.diogo.site/?controller=BoardViewController&amp;action=readonly&amp;token=03795efb8138c4e7661a900c234c0df1bc3fc03cdfcda8619cd5d0e666de" rel="nofollow">TODO list</a>, we will go through <a href="https://www.diogo.site/projects/GNU-social/soc/2020/" rel="nofollow">this during the summer of 2020</a>. That is, we might release v2 before adding namespaces but, v3 will have them.</p>

<p>Thanks you for your contributions! :)</p>

									
								</div>
								<div class="raw-content hide">I agree that adding namespaces to the current codebase will be a lot of work. 

Once proper ActivityPub support is achieved, i.e., we finish our current [TODO list](https://kanban.diogo.site/?controller=BoardViewController&amp;action=readonly&amp;token=03795efb8138c4e7661a900c234c0df1bc3fc03cdfcda8619cd5d0e666de), we will go through [this during the summer of 2020](https://www.diogo.site/projects/GNU-social/soc/2020/). That is, we might release v2 before adding namespaces but, v3 will have them.

Thanks you for your contributions! :)
</div>
								<div class="edit-content-zone hide" data-write="issuecomment-17709-write" data-preview="issuecomment-17709-preview" data-update-url="/diogo/gnu-social/comments/17709" data-context="/diogo/gnu-social"></div>
							</div>
							
						</div>
					</div>
				

			
				

				
				
					<div class="comment" id="issuecomment-17710">
						<a class="avatar" href="/senooken">
							<img src="https://seccdn.libravatar.org/avatar/5349e716212163fd511dfe106ff42e0a">
						</a>
						<div class="content">
							<div class="ui top attached header">
								<span class="text grey"><a href="/senooken">SENOO, Ken</a> commented <a href="#issuecomment-17710"><span class="time-since" title="Fri, 14 Feb 2020 21:51:49 UTC">8 months ago</span></a></span>
								<div class="ui right actions">
									
										<div class="item tag">
											
												Poster
											
										</div>
									
									
								</div>
							</div>
							<div class="ui attached segment">
								<div class="render-content markdown has-emoji">
									
										<p>OK. I will watch TODO list also.
I apply in this commit only my server, although it is for lazy for me....
Thanks.</p>

									
								</div>
								<div class="raw-content hide">OK. I will watch TODO list also.
I apply in this commit only my server, although it is for lazy for me....
Thanks.</div>
								<div class="edit-content-zone hide" data-write="issuecomment-17710-write" data-preview="issuecomment-17710-preview" data-update-url="/diogo/gnu-social/comments/17710" data-context="/diogo/gnu-social"></div>
							</div>
							
						</div>
					</div>
				

			

			
				<div class="comment merge box">
					<a class="avatar text
					red"><span class="mega-octicon octicon-git-merge"></span></a>
					<div class="content">
						<div class="ui merge segment">
							
								<div class="item text red">
									<span class="octicon octicon-x"></span>
									This pull request can&#39;t be merged automatically because there are conflicts.
								</div>
								<div class="item text grey">
									<span class="octicon octicon-info"></span>
									Please merge manually in order to resolve the conflicts.
								</div>
							
						</div>
					</div>
				</div>
			

			
				<div class="ui warning message">
					<a href="/user/login?redirect_to=/diogo/gnu-social/pulls/110">Sign in</a> to join this conversation.
				</div>
			
		</ui>
	</div>

	<div class="four wide column">
		<div class="ui segment metas">
			<div class="ui disabled floating jump select-label dropdown">
				<span class="text">
					<strong>Labels</strong>
					<span class="octicon octicon-gear"></span>
				</span>
				<div class="filter menu" data-action="update" data-update-url="/diogo/gnu-social/issues/110/label">
					<div class="no-select item">Clear labels</div>
					
						<a class=" item" href="#" data-id="1564" data-id-selector="#label_1564"><span class="octicon "></span><span class="label color" style="background-color: #fbca04"></span> bounty</a>
					
						<a class=" item" href="#" data-id="1483" data-id-selector="#label_1483"><span class="octicon "></span><span class="label color" style="background-color: #ee0701"></span> bug</a>
					
						<a class=" item" href="#" data-id="1484" data-id-selector="#label_1484"><span class="octicon "></span><span class="label color" style="background-color: #cccccc"></span> duplicate</a>
					
						<a class="checked item" href="#" data-id="1485" data-id-selector="#label_1485"><span class="octicon octicon-check"></span><span class="label color" style="background-color: #84b6eb"></span> enhancement</a>
					
						<a class=" item" href="#" data-id="1486" data-id-selector="#label_1486"><span class="octicon "></span><span class="label color" style="background-color: #128a0c"></span> help wanted</a>
					
						<a class=" item" href="#" data-id="1487" data-id-selector="#label_1487"><span class="octicon "></span><span class="label color" style="background-color: #e6e6e6"></span> invalid</a>
					
						<a class=" item" href="#" data-id="1488" data-id-selector="#label_1488"><span class="octicon "></span><span class="label color" style="background-color: #cc317c"></span> question</a>
					
						<a class=" item" href="#" data-id="1565" data-id-selector="#label_1565"><span class="octicon "></span><span class="label color" style="background-color: #d4c5f9"></span> RFC</a>
					
						<a class=" item" href="#" data-id="1841" data-id-selector="#label_1841"><span class="octicon "></span><span class="label color" style="background-color: #0052cc"></span> v3</a>
					
						<a class=" item" href="#" data-id="1489" data-id-selector="#label_1489"><span class="octicon "></span><span class="label color" style="background-color: #ffffff"></span> wontfix</a>
					
				</div>
			</div>
			<div class="ui labels list">
				<span class="no-select item hide">No Label</span>
				
					<div class="item">
						<a class="ui label hide" id="label_1564" href="/diogo/gnu-social/issues?labels=1564" style="color: #000; background-color: #fbca04">bounty</a>
					</div>

				
					<div class="item">
						<a class="ui label hide" id="label_1483" href="/diogo/gnu-social/issues?labels=1483" style="color: #fff; background-color: #ee0701">bug</a>
					</div>

				
					<div class="item">
						<a class="ui label hide" id="label_1484" href="/diogo/gnu-social/issues?labels=1484" style="color: #000; background-color: #cccccc">duplicate</a>
					</div>

				
					<div class="item">
						<a class="ui label " id="label_1485" href="/diogo/gnu-social/issues?labels=1485" style="color: #000; background-color: #84b6eb">enhancement</a>
					</div>

				
					<div class="item">
						<a class="ui label hide" id="label_1486" href="/diogo/gnu-social/issues?labels=1486" style="color: #fff; background-color: #128a0c">help wanted</a>
					</div>

				
					<div class="item">
						<a class="ui label hide" id="label_1487" href="/diogo/gnu-social/issues?labels=1487" style="color: #000; background-color: #e6e6e6">invalid</a>
					</div>

				
					<div class="item">
						<a class="ui label hide" id="label_1488" href="/diogo/gnu-social/issues?labels=1488" style="color: #fff; background-color: #cc317c">question</a>
					</div>

				
					<div class="item">
						<a class="ui label hide" id="label_1565" href="/diogo/gnu-social/issues?labels=1565" style="color: #000; background-color: #d4c5f9">RFC</a>
					</div>

				
					<div class="item">
						<a class="ui label hide" id="label_1841" href="/diogo/gnu-social/issues?labels=1841" style="color: #fff; background-color: #0052cc">v3</a>
					</div>

				
					<div class="item">
						<a class="ui label hide" id="label_1489" href="/diogo/gnu-social/issues?labels=1489" style="color: #000; background-color: #ffffff">wontfix</a>
					</div>

				
			</div>

			<div class="ui divider"></div>

			<div class="ui disabled floating jump select-milestone dropdown">
				<span class="text">
					<strong>Milestone</strong>
					<span class="octicon octicon-gear"></span>
				</span>
				<div class="menu" data-action="update" data-update-url="/diogo/gnu-social/issues/110/milestone">
					<div class="no-select item">Clear milestone</div>
					
					
				</div>
			</div>
			<div class="ui select-milestone list">
				<span class="no-select item ">No Milestone</span>
				<div class="selected">
					
				</div>
			</div>

			<div class="ui divider"></div>

			<input id="assignee_id" name="assignee_id" type="hidden" value="">
			<div class="ui disabled floating jump select-assignee dropdown">
				<span class="text">
					<strong>Assignee</strong>
					<span class="octicon octicon-gear"></span>
				</span>
				<div class="menu" data-action="update" data-update-url="/diogo/gnu-social/issues/110/assignee">
					<div class="no-select item">Clear assignee</div>
					
				</div>
			</div>
			<div class="ui select-assignee list">
				<span class="no-select item ">No assignee</span>
				<div class="selected">
					
				</div>
			</div>

			<div class="ui divider"></div>

			<div class="ui participants">
				<span class="text"><strong>2 Participants</strong></span>
				<div>
					
						<a href="/senooken">
							<img class="ui avatar image poping up" src="https://seccdn.libravatar.org/avatar/5349e716212163fd511dfe106ff42e0a" data-content="SENOO, Ken" data-position="top center" data-variation="small inverted">
						</a>
					
						<a href="/diogo">
							<img class="ui avatar image poping up" src="/avatars/12290" data-content="Diogo Cordeiro" data-position="top center" data-variation="small inverted">
						</a>
					
				</div>
			</div>
		</div>
	</div>
</div>

<div class="hide" id="edit-content-form">
	<div class="ui comment form">
		<div class="ui top attached tabular menu">
			<a class="active write item">Write</a>
			<a class="preview item" data-url="/api/v1/markdown" data-context="/diogo/gnu-social">Preview</a>
		</div>
		<div class="ui bottom attached active write tab segment">
			<textarea tabindex="1" id="content" name="content"></textarea>
		</div>
		<div class="ui bottom attached tab preview segment markdown">
			Loading...
		</div>
		<div class="text right edit buttons">
			<div class="ui basic blue cancel button" tabindex="3">Cancel</div>
			<div class="ui green save button" tabindex="2">Save</div>
		</div>
	</div>
</div>

<div class="hide" id="no-content">
	<span class="no-content">There is no content yet.</span>
</div>

			</div>
		
	</div>
</div>

	</div>
	<footer>
		<div class="ui container">
			<div class="ui left">



				<a href="/tos">Terms of Service</a>
				&bull;
				<a href="/about">About us</a>
				&bull;
				<a href="/outages">Outages</a>
				&bull;
				<a href="/hp/gogs/issues">Report a problem</a>
				&bull;
				<a href="/assets/librejs/librejs.html" data-jslicense="1">Javascript licenses</a>
				&bull;
				<a href="/fingerprints">SSH Fingerprints</a>



			</div>
			<div class="ui right links">
				
				<div class="ui language bottom floating slide up dropdown link item">
					<i class="world icon"></i>
					<div class="text">English</div>
					<div class="menu">
						
							<a class="item active selected" href="#">English</a>
						
							<a class="item " href="/diogo/gnu-social/pulls/110?lang=zh-CN">简体中文</a>
						
							<a class="item " href="/diogo/gnu-social/pulls/110?lang=zh-HK">繁體中文（香港）</a>
						
							<a class="item " href="/diogo/gnu-social/pulls/110?lang=zh-TW">繁體中文（臺灣）</a>
						
							<a class="item " href="/diogo/gnu-social/pulls/110?lang=de-DE">Deutsch</a>
						
							<a class="item " href="/diogo/gnu-social/pulls/110?lang=fr-FR">français</a>
						
							<a class="item " href="/diogo/gnu-social/pulls/110?lang=nl-NL">Nederlands</a>
						
							<a class="item " href="/diogo/gnu-social/pulls/110?lang=lv-LV">latviešu</a>
						
							<a class="item " href="/diogo/gnu-social/pulls/110?lang=ru-RU">русский</a>
						
							<a class="item " href="/diogo/gnu-social/pulls/110?lang=ja-JP">日本語</a>
						
							<a class="item " href="/diogo/gnu-social/pulls/110?lang=es-ES">español</a>
						
							<a class="item " href="/diogo/gnu-social/pulls/110?lang=pt-BR">português do Brasil</a>
						
							<a class="item " href="/diogo/gnu-social/pulls/110?lang=pl-PL">polski</a>
						
							<a class="item " href="/diogo/gnu-social/pulls/110?lang=bg-BG">български</a>
						
							<a class="item " href="/diogo/gnu-social/pulls/110?lang=it-IT">italiano</a>
						
							<a class="item " href="/diogo/gnu-social/pulls/110?lang=fi-FI">suomi</a>
						
							<a class="item " href="/diogo/gnu-social/pulls/110?lang=tr-TR">Türkçe</a>
						
							<a class="item " href="/diogo/gnu-social/pulls/110?lang=cs-CZ">čeština</a>
						
							<a class="item " href="/diogo/gnu-social/pulls/110?lang=sr-SP">српски</a>
						
							<a class="item " href="/diogo/gnu-social/pulls/110?lang=sv-SE">svenska</a>
						
							<a class="item " href="/diogo/gnu-social/pulls/110?lang=ko-KR">한국어</a>
						
							<a class="item " href="/diogo/gnu-social/pulls/110?lang=gl-ES">galego</a>
						
							<a class="item " href="/diogo/gnu-social/pulls/110?lang=uk-UA">українська</a>
						
							<a class="item " href="/diogo/gnu-social/pulls/110?lang=en-GB">English (United Kingdom)</a>
						
							<a class="item " href="/diogo/gnu-social/pulls/110?lang=hu-HU">Magyar</a>
						
							<a class="item " href="/diogo/gnu-social/pulls/110?lang=sk-SK">Slovenčina</a>
						
							<a class="item " href="/diogo/gnu-social/pulls/110?lang=id-ID">Indonesian</a>
						
							<a class="item " href="/diogo/gnu-social/pulls/110?lang=fa-IR">Persian</a>
						
					</div>
				</div>



				
			</div>
		</div>
	</footer>
</body>



	<link rel="stylesheet" href="/plugins/highlight-9.6.0/github.css">
	<script src="/plugins/highlight-9.6.0/highlight.pack.js"></script>




	<link rel="stylesheet" href="/plugins/dropzone-4.2.0/dropzone.css">
	<script src="/plugins/dropzone-4.2.0/dropzone.js"></script>

<script src="/js/libs/emojify-1.1.0.min.js"></script>
<script src="/js/libs/clipboard-1.5.9.min.js"></script>
	
</html>

